From 59c23cdfdffbcb8626b53d010a1c3253d255668e Mon Sep 17 00:00:00 2001
From: Chanaka Jayasena <chanaka3d@gmail.com>
Date: Fri, 21 Mar 2014 13:56:58 +0530
Subject: [PATCH] Adding new fields to subscribe cartridge page.

---
 .../console/themes/theme1/partials/header.hbs      |   10 ++++----
 .../themes/theme1/partials/subscribe_cartridge.hbs |   26 +++++++++-----------
 .../console/themes/theme1/partials/tenant_new.hbs  |    4 +--
 .../themes/theme1/ui/js/tenant_management.js       |    9 ++++++-
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
index 7e02db1..45b4f3a 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
@@ -19,7 +19,7 @@
                  </div>
                  <div class="col-lg-9 custom-nav">
                     <ul class="pull-left">
-                        <!-- li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/dashboard.jag"}}"><i class="fa fa-dashboard"></i> <span><br>Dashboard</span></a></li -->
+                        <!-- li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/dashboard.jag"}}"><i class="fa fa-dashboard"></i> <span><br>Dashboard</span></a></li -->
                         <li {{#if my_cartridges}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-tasks"></i>  <span><br>My Cartridges</span></a></li>
                         {{#isAllowed "configure"}}<li {{#if configure_stratos}} class="active" {{/if}}><a href="{{url "/configure_stratos.jag"}}"><i class="fa fa-cogs"></i> <span><br>Configure Stratos</span></a></li>{{/isAllowed}}
                         {{#isAllowed "tenant-mgt"}}<li {{#if tenant_mgt}} class="active" {{/if}}><a href="{{url "/tenant_management.jag"}}"><i class="fa fa-user"></i> <span><br>Tenant Mgt</span></a></li>{{/isAllowed}}
@@ -28,7 +28,7 @@
                      <li class="dropdown">
                              <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><br /> {{#user}}{{/user}} <b class="caret"></b></a>
                              <ul class="dropdown-menu">
-                                 <!--li><a><i class="fa fa-file-text-o"></i> View Profile</a></li -->
+                                 <!--li><a><i class="fa fa-file-text-o"></i> View Profile</a></li -->
                                 <li>
                                     <a href="{{url "/controllers/logout.jag"}}"><i class="fa fa-sign-out"></i> logout</a>
                                 </li>
@@ -49,12 +49,12 @@
                             <a class="btn {{button.class_name}}" href="{{url button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
                         </div>
                         {{#if has_action_buttons}}
-                        <div class="col-lg-4 action-buttons">
+                        <div class="col-lg-4 action-buttons">
                             <button class="btn btn-default" onclick="manage_selected('activate')" type="button">Activate</button>
                             <button class="btn btn-default" onclick="manage_selected('deactivate')">Deactivate</button>
-                            <button class="btn btn-default" onclick="manage_selected('delete')">Delete</button>
+                            <!--<button class="btn btn-default" onclick="manage_selected('delete')">Delete</button>-->
                         </div>
-                        <div class="col-lg-5 help-section">
+                        <div class="col-lg-5 help-section">
                             {{#if has_help}}
                                 <i class="icons-help"></i>
                                 <p>{{help}}</p>
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
index 8368fe0..8392503 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs
@@ -9,15 +9,14 @@
 <div class="container">
     <div class="row">
         <div class="col-lg-12">
-            <form method="post" role="form" action="{{url "/controllers/cartridgeSubscribeSubmit.jag"}}" id="newTenantForm">
+            <form method="post" role="form" action="{{url "/controllers/cartridgeSubscribeSubmit.jag"}}" id="subscribeCartridgeForm">
             <div class="form-group">
                 <label class="required">Public URL:</label>
                 <div class="form-inline">
                     <input name="cartridgeType" type="hidden" value="{{cartridgeType}}"/>
                     <input name="alias"
                            type="text"
-                           class="required"
-                           class="form-control input-xlarge js-help"
+                           class="required form-control input-xlarge js-help"
                            data-help="Specify a unique alias which can be used to generate the hostname as alias.hostname from cartridge"
                            data-help-x-offset="50"
                            data-help-y-offset="10"
@@ -36,8 +35,7 @@
                     <div class="form-inline">
                         <input name="repoURL"
                                type="text"
-                               class="required"
-                               class="form-control input-xlarge js-help"
+                               class="required form-control input-xlarge js-help"
                                data-help="Specify a repository URL of the artifacts."
                                data-help-x-offset="50"
                                data-help-y-offset="10"
@@ -146,14 +144,19 @@
                  {{/unless}}
              {{/if}}
 
+            <div class="form-group">
+                <label class="required">New Checkbox:</label>
+                <label>
+                    <input name="new_checkbox" type="checkbox" id="new_checkbox"/> Require Persistent Storage
+                </label>
+            </div>
+
 
             <button type="submit" class="btn btn-primary">Subscribe to Cartridge</button>
             </form>
         </div>
     </div>
 </div>
-<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
-<script src="{{url "/themes/theme1/ui/js/tenant_management.js"}}"></script>
 <script>
     $(function(){
         $('.js-help')
@@ -190,14 +193,9 @@
         $volume_check.click(function(){
             $('#persistence_container').toggle($volume_check.checked);
         });
-    });
-
-     $('#alias').keyup(function(){
-        if($(this).val() != ""){
-             $('#domainMessage').show().html('Domain is not available').addClass('noDomain').removeClass('hasDomain');
-        }
 
+        $( "#subscribeCartridgeForm" ).validate();
     });
 
+
 </script>
-<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
index f798846..2836b6e 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
@@ -40,11 +40,11 @@
 
                 <div class="col-md-3 padding-remover-left">
                     <label  class="required">Admin Password:</label>
-                    <input class="required" name="adminPassword" type="password"/>
+                    <input class="required" name="adminPassword" id="adminPassword" type="password"/>
                 </div>
                 <div class="col-md-3">
                     <label class="required">Admin Password (Repeat):</label>
-                    <input class="required" type="password"/>
+                    <input class="required" name="adminPassword_again" id="adminPassword_again" type="password"/>
                 </div>
 
                 <div class="clearfix"></div>
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js
index 3c37f33..7b0bb6d 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js
@@ -6,8 +6,15 @@ $(function(){
             $('table input.js_domainCheck').prop('checked',false);
         }
     });
+    $( "#newTenantForm" ).validate({
+        rules: {
+            adminPassword: "required",
+            adminPassword_again: {
+                equalTo: "#adminPassword"
+            }
+        }
+    });
 
-    $('#newTenantForm').validate();
 });
 function manage_selected(action){
     var checked = "";
-- 
1.7.9.5